Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master
authorRob Browning <rlb@defaultvalue.org>
Fri, 5 Sep 2008 16:24:04 +0000 (11:24 -0500)
committerRob Browning <rlb@defaultvalue.org>
Fri, 5 Sep 2008 16:24:04 +0000 (11:24 -0500)
commit6bbf1afd183f1b4aa9bd137863c8d44ca1146e00
tree46ebfa602bd2aff73bc265380197f8554a95799c
parent469e7be33da63921c1f98776a6a97888ec6696a0
parentd2e84c95f1d5cea598088edbda7de2a00b748d64
Merge branch 'deb/emacs22/d/sid/upstream' into deb/emacs22/d/sid/master